From 31d7733feb7e9ca8ba050cbd9950ac52e2916de3 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Sun, 13 Jul 2003 12:42:09 +0000 Subject: [PATCH] bitkeeper revision 1.342 (3f1153a1RLTmwr7Jo9U1gUChA4e0Jw) cleanup --- xenolinux-2.4.21-sparse/arch/xeno/mm/ioremap.c | 15 ++++++--------- xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/xenolinux-2.4.21-sparse/arch/xeno/mm/ioremap.c b/xenolinux-2.4.21-sparse/arch/xeno/mm/ioremap.c index 3e060ed5df..d537956105 100644 --- a/xenolinux-2.4.21-sparse/arch/xeno/mm/ioremap.c +++ b/xenolinux-2.4.21-sparse/arch/xeno/mm/ioremap.c @@ -175,6 +175,11 @@ void iounmap(void *addr) vfree((void *)((unsigned long)addr & PAGE_MASK)); } +/* implementation of boot time ioremap for purpose of provising access +to the vga console for privileged domains. Unlike boot time ioremap on +other architectures, ours is permanent and not reclaimed when then vmalloc +infrastructure is started */ + void __init *bt_ioremap(unsigned long machine_addr, unsigned long size) { unsigned long offset, last_addr; @@ -206,25 +211,17 @@ void __init *bt_ioremap(unsigned long machine_addr, unsigned long size) idx = FIX_BTMAP_BEGIN; while (nrpages > 0) { set_fixmap(idx, machine_addr); - - //unsigned long address = __fix_to_virt(idx); - - - -//direct_set_pte(address, direct_mk_pte_phys(machine_addr, PAGE_KERNEL_NOCACHE)); - machine_addr += PAGE_SIZE; --idx; --nrpages; } -flush_tlb_all(); + flush_tlb_all(); return (void*) (offset + fix_to_virt(FIX_BTMAP_BEGIN)); } #if 0 /* We don't support these functions. They shouldn't be required. */ -void __init *bt_ioremap(unsigned long machine_addr, unsigned long size) {} void __init bt_iounmap(void *addr, unsigned long size) {} #endif diff --git a/xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h b/xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h index d6826ee365..3dea10fdc6 100644 --- a/xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h +++ b/xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h @@ -50,7 +50,7 @@ enum fixed_addresses { #define NR_FIX_BTMAPS 8 /* 32KB For the Dom0 VGA Console */ FIX_BTMAP_END, FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS - 1, - + /* our bt_ioremap is permenant unlike other architectures */ __end_of_permanent_fixed_addresses, __end_of_fixed_addresses = __end_of_permanent_fixed_addresses }; -- 2.30.2